Sync with Tramp 2.1.10.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 37df84ec4ca7d3e2b4a71709754d8badcc2cdc43..ba23d3e9bdcc889e535f83dcc691972886dfc729 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2007-07-22  Michael Albinus  <michael.albinus@gmx.de>
+
+        Sync with Tramp 2.1.10.
+
+       * tramp.el (tramp-get-ls-command): Fyx typo.
+
+        * trampver.el: Update release number.
+
 2007-07-22  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 
        * startup.el (command-line-x-option-alist): Use x-handle-no-bitmap-icon,

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 792233925fc16494d45c65de98486ab97f75f91f..cbe7040f609edb45cc742f95b38962ca08f29309 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -6551,8 +6551,7 @@ necessary only.  This function will be used in file name completion."
                   (and
                    dl
                    (not
-                    (string-equal
-                     result (expand-file-name-as-directory cmd (car dl)))))
+                    (string-equal result (expand-file-name cmd (car dl)))))
                 (setq dl (cdr dl)))
               (setq dl (cdr dl))))))
        (tramp-error vec 'file-error "Couldn't find a proper `ls' command")))))